From 4e3645c1b018f7a48b1bdfccca04a3b9008af1e9 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 1 Sep 2010 10:17:29 +0100 Subject: [PATCH] hvm: Fix merging error in hvm_op.h A couple of new hvm_op commands were erroneously ifdef'ed to be accessible only to the toolstack. Signed-off-by: Tim Deegan --- xen/include/public/hvm/hvm_op.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/public/hvm/hvm_op.h b/xen/include/public/hvm/hvm_op.h index 7f644d38af..689521bfd9 100644 --- a/xen/include/public/hvm/hvm_op.h +++ b/xen/include/public/hvm/hvm_op.h @@ -128,6 +128,8 @@ struct xen_hvm_set_mem_type { typedef struct xen_hvm_set_mem_type xen_hvm_set_mem_type_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_mem_type_t); +#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ + /* Hint from PV drivers for pagetable destruction. */ #define HVMOP_pagetable_dying 9 struct xen_hvm_pagetable_dying { @@ -155,6 +157,4 @@ struct xen_hvm_xentrace { typedef struct xen_hvm_xentrace xen_hvm_xentrace_t; DEFINE_XEN_GUEST_HANDLE(xen_hvm_xentrace_t); -#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ - #endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */ -- 2.30.2